Revision: baz--fixmissing--1.3--patch-21
Archive: jblack@gnuarch.org--2005
Creator: James Blackwell <jblack@canonical.com>
Date: Tue Apr  5 17:48:05 EDT 2005
Standard-date: 2005-04-05 21:48:05 GMT
New-files: libarch/.arch-ids/inventory-entry.c.id
    libarch/.arch-ids/inventory-entry.h.id
    libarch/inventory-entry.c libarch/inventory-entry.h
    tests/.arch-ids/test-id.sh.id tests/test-id.sh
Modified-files: commands/branch.c commands/cacherev.c
    commands/export.c commands/get.c commands/grab.c
    commands/id.c commands/import-old.c commands/import.c
    commands/replay.c commands/tests/Makefile.in
    commands/whereis-archive.c libarch/archive-cache.c
    libarch/build-revision.c libarch/build-revision.h
    libarch/debug.h libarch/inv-ids.c libarch/invent.c
    libarch/library-txn.c libarch/local-cache.c
    libarch/null-project-tree.c libarch/pfs-signatures.c
    libarch/pristines.c libarch/project-tree.c
    libarch/project-tree.h libarch/tests/Makefile.in
    libarch/tests/unit-inv-ids.c libarch/tla-project-tree.c
    tests/Makefile.in tests/test-archive-registration.sh
    tests/test-mirror.sh
New-patches: aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-11
    aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-12
    aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-13
    aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-14
    aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-15
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--base-0
    aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-1
    jblack@gnuarch.org--2005/baz--fixmissing--1.3--patch-21
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-23
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-24
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-25
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-26
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-27
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-28
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-29
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-30
    robert.collins@canonical.com--general/bazaar--devel--1.3--patch-31
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-1
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-2
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-3
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-4
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-5
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-6
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-7
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-8
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-9
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-10
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-11
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-12
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-13
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-14
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-15
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-16
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-17
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-18
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-19
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-20
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-21
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-22
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-23
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-24
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-25
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-26
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-27
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-28
    robert.collins@canonical.com--general/bazaar--ng--1.3--patch-29
    thelove@canonical.com/bazaar--devo--1.3--patch-39
    thelove@canonical.com/bazaar--devo--1.3--patch-40
    thelove@canonical.com/bazaar--devo--1.3--patch-41
    thelove@canonical.com/bazaar--devo--1.3--patch-42
    thelove@canonical.com/bazaar--devo--1.3--patch-43
    thelove@canonical.com/bazaar--devo--1.3--patch-44
    thelove@canonical.com/bazaar--devo--1.3--patch-45
    thelove@canonical.com/bazaar--devo--1.3--patch-46
    thelove@canonical.com/bazaar--devo--1.3--patch-47
    thelove@canonical.com/bazaar--devo--1.3--patch-48
Summary: Merging from upstream
Keywords: 

Patches applied:

 * aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-11
   Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-12
   Reduced build chatter

 * aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-13
   Improved backbuilder chatter

 * aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-14
   Dirty Merge (Canonical.com Patch Queue Manager)

 * aaron.bentley@utoronto.ca--baz/bazaar--backbuilder--0--patch-15
   Removed all use of chatter from build-revision and call-sites

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--base-0
   tag of thelove@canonical.com/bazaar--devo--1.3--patch-46

 * aaron.bentley@utoronto.ca--baz/bazaar--smallstuff--1.3--patch-1
   Fixed infinite loop in sig-checking code

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-23
   fix whereis-archive --all-locations to not be always on

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-24
   merge in id and inventory sanification patch, fixes minor tagline bug, and makes internal interface much more robust

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-25
   unbreak baz replay patch-X

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-26
   merge from thelove

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-27
   oops, remove -ng- test script from tests/Makefile.in

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-28
   bugfix: segsigv in new signature check code - key is NULL when gpg is missing the key

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-29
   bugfix: double-free in export

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-30
   bugfix: baz segfaults on import with a unregistered archive (#284)

 * robert.collins@canonical.com--general/bazaar--devel--1.3--patch-31
   build testing is good mkay

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-1
   fix tree-root compatability detection, and teach tree root about bzr format trees

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-2
   fix tree-root compatability detection, and teach tree root about bzr format trees

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-3
   propogate typed tree roots out from arch inventory_id

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-4
   make tree initialization load a virtual table, and use that to make arch_tree_id_tagging_method virtual

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-5
   tweak arch_project_tree interface tweaking for commands/id to be ready for bzr trees

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-6
   prepare to override file_id on a per tree basis

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-7
   prepare to override file_id on a per tree basis - new files missed before

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-8
   give arch_project_t subclasses different storage - init becomes new, finalise delete in client code, and two new vtable methods finalise and init are created

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-9
   make untagged_is_source parameter of file_id and arch_inventory_id become part of the tree state.

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-10
   nuke ftag_method enum for arch_id_tagging_method, and move file_id method passing into the tree

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-11
   nuke limits in call to file_id - only one caller, and it was hard coded

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-12
   move id_tagging_shortcut outside of arch_inventory_id callpath

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-13
   move explicit_skips outside of arch_inventory_id callpath

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-14
   arch_inventory_id is now sane to use

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-15
   merge in debug branch

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-16
   missed export for the tree_init -> new change

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-17
   baz id foo in a trivial bzr tree works

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-18
   split out the inventory from the bzr tree proper

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-19
   split out the inventory from the bzr tree proper - new files. DOH.

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-20
   bump to new bzr format

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-21
   add expat to unit test makefile rules

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-22
   partial merge from archive-registration

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-23
   full merge from archive-registration branch

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-24
   introduce a formal inventory-file layer

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-25
   rename the base inventory_file_t to inventory_entry_t and make the arch_inventory_id underlying layer return an inventory_entry_t rather than char *

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-26
   add inventory_link_t type.

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-27
   create arch_project_tree_path_inventory method

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-28
   bugfix and correct the id command. This patch makes the id retrieval process always accept tree-relative paths only

 * robert.collins@canonical.com--general/bazaar--ng--1.3--patch-29
   unbreak inventory of non tree trees

 * thelove@canonical.com/bazaar--devo--1.3--patch-39
   More test cases for branch in test-archive-registration.sh

 * thelove@canonical.com/bazaar--devo--1.3--patch-40
   fix whereis-archive --all-locations to not be always on

 * thelove@canonical.com/bazaar--devo--1.3--patch-41
   really committing chatter updates

 * thelove@canonical.com/bazaar--devo--1.3--patch-42
   use debug for build chatter

 * thelove@canonical.com/bazaar--devo--1.3--patch-43
   bugfix for id on taglined files, overhaul internal inventory to be tree-relative, and bugfix replay patch-X

 * thelove@canonical.com/bazaar--devo--1.3--patch-44
   bugfix: segsigv in new signature check code - key is NULL when gpg is missing the key

 * thelove@canonical.com/bazaar--devo--1.3--patch-45
   bugfix: double-free in export

 * thelove@canonical.com/bazaar--devo--1.3--patch-46
   bugfix: baz segfaults on import with a unregistered archive (#284)

 * thelove@canonical.com/bazaar--devo--1.3--patch-47
   Fixed infinite loop in signature code

 * thelove@canonical.com/bazaar--devo--1.3--patch-48
   build-config contents test for url, old new

